Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark 'group names supported' in the groups cluster feature map #20527

Merged
merged 1 commit into from
Jul 9, 2022
Merged

Mark 'group names supported' in the groups cluster feature map #20527

merged 1 commit into from
Jul 9, 2022

Conversation

woody-apple
Copy link
Contributor

Problem

Group name support must be in sync between feature map and namesupport. Only namesupport used to be set.

Fixes #19613

Change overview

  • Define the feature map bitflags in xml
  • Use the feature map bitflags in groups server
  • minor constant rename for namesupport flags

Testing

Compiled all-clusters-app on linux. Got:

❯ ./out/linux-x64-chip-tool/chip-tool groups read name-support 1 0 | grep -A1 'Endpoint: 0 Cluster:'
[1657221972.727541][3275513:3275519] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 2315505673
[1657221972.727546][3275513:3275519] CHIP:TOO:   name support: 128
❯ ./out/linux-x64-chip-tool/chip-tool groups read feature-map 1 0 | grep -A1 'Endpoint: 0 Cluster:'
[1657221979.096411][3275989:3275995] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFC DataVersion: 2315505673
[1657221979.096414][3275989:3275995] CHIP:TOO:   FeatureMap: 1

@github-actions
Copy link

github-actions bot commented Jul 9, 2022 •
edited
Loading

PR #20527: Size comparison from a6470a0 to 3c7208f

Increases (26 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section a6470a0 3c7208f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 665755 665803 48 0.0
.text 577372 577420 48 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 631555 631587 32 0.0
.text 553924 553956 32 0.0
lock-ftd LP_CC2652R7 (read only) 668655 668703 48 0.0
.text 591968 592016 48 0.0
lock-mtd LP_CC2652R7 (read only) 618055 618103 48 0.0
.text 541480 541528 48 0.0
shell LP_CC2652R7 (read only) 658246 658278 32 0.0
.text 573084 573116 32 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579230 579270 40 0.0
.app_xip_area 458000 458040 40 0.0
lock cyw930739m2evb_01 (read/write) 585166 585206 40 0.0
.app_xip_area 459200 459240 40 0.0
efr32 lighting-app BRD4161A (read/write) 1080724 1080812 88 0.0
.text 945660 945748 88 0.0
BRD4161A+rpc (read/write) 1135052 1135132 80 0.0
.text 983096 983176 80 0.0
BRD4161A+rs911x (read/write) 947252 947340 88 0.0
.text 804416 804504 88 0.0
lock-app BRD4161A+wf200 (read/write) 1128384 1128488 104 0.0
.text 982116 982220 104 0.0
window-app BRD4161A (read/write) 1074508 1074612 104 0.0
.text 937940 938044 104 0.0
esp32 all-clusters-app c3devkit (read only) 1019596 1019660 64 0.0
(read/write) 1485458 1485490 32 0.0
.flash.rodata 215344 215376 32 0.0
.flash.text 1019596 1019660 64 0.0
m5stack (read only) 1073531 1073583 52 0.0
(read/write) 487536 487568 32 0.0
.flash.rodata 245796 245828 32 0.0
.flash.text 1068147 1068199 52 0.0
k32w light k32w061+release (read/write) 658288 658336 48 0.0
.text 580980 581028 48 0.0
lock k32w061+release (read/write) 685060 685092 32 0.0
.text 607276 607308 32 0.0
linux thermostat-no-ble arm64 (read only) 2593076 2593300 224 0.0
.rodata 165380 165412 32 0.0
.text 2187920 2188112 192 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2447552 2447656 104 0.0
.text 1410196 1410300 104 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1174607 1174687 80 0.0
rodata 141776 141808 32 0.0
text 811032 811084 52 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1154799 1154883 84 0.0
rodata 133304 133340 36 0.0
text 800476 800528 52 0.0
p6 all-clusters-app default (read/write) 2564704 2564784 80 0.0
.text 1522968 1523048 80 0.0
all-clusters-minimal-app default (read/write) 2509744 2509840 96 0.0
.text 1468008 1468104 96 0.0
light-app default (read/write) 2440048 2440128 80 0.0
.text 1398312 1398392 80 0.0
lock-app default (read/write) 2467288 2467392 104 0.0
.text 1425552 1425656 104 0.0
telink light-switch-app tlsr9518adk80d (read/write) 796720 796812 92 0.0
text 565218 565278 60 0.0
lighting-app tlsr9518adk80d (read/write) 816548 816648 100 0.0
text 581540 581602 62 0.0
Decreases (3 builds for cc13x2_26x2)
platform target config section a6470a0 3c7208f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 185468 185420 -48 -0.0
lock-ftd LP_CC2652R7 (read/write) 172712 172664 -48 -0.0
shell LP_CC2652R7 (read/write) 188480 188448 -32 -0.0
Full report (30 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section a6470a0 3c7208f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 665755 665803 48 0.0
(read/write) 185468 185420 -48 -0.0
.bss 74116 74116 0 0.0
.data 3356 3356 0 0.0
.rodata 88067 88067 0 0.0
.text 577372 577420 48 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 631555 631587 32 0.0
(read/write) 157684 157684 0 0.0
.bss 73412 73412 0 0.0
.data 3356 3356 0 0.0
.rodata 77307 77307 0 0.0
.text 553924 553956 32 0.0
lock-ftd LP_CC2652R7 (read only) 668655 668703 48 0.0
(read/write) 172712 172664 -48 -0.0
.bss 71148 71148 0 0.0
.data 3280 3280 0 0.0
.rodata 76207 76207 0 0.0
.text 591968 592016 48 0.0
lock-mtd LP_CC2652R7 (read only) 618055 618103 48 0.0
(read/write) 144264 144264 0 0.0
.bss 66868 66868 0 0.0
.data 3280 3280 0 0.0
.rodata 76087 76087 0 0.0
.text 541480 541528 48 0.0
pump-app LP_CC2652R7 (read only) 677799 677799 0 0.0
(read/write) 164416 164416 0 0.0
.bss 71228 71228 0 0.0
.data 3280 3280 0 0.0
.rodata 88431 88431 0 0.0
.text 588884 588884 0 0.0
pump-controller-app LP_CC2652R7 (read only) 663623 663623 0 0.0
(read/write) 178712 178712 0 0.0
.bss 71348 71348 0 0.0
.data 3276 3276 0 0.0
.rodata 84295 84295 0 0.0
.text 578848 578848 0 0.0
shell LP_CC2652R7 (read only) 658246 658278 32 0.0
(read/write) 188480 188448 -32 -0.0
.bss 76420 76420 0 0.0
.data 3360 3360 0 0.0
.rodata 84846 84846 0 0.0
.text 573084 573116 32 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579230 579270 40 0.0
.app_xip_area 458000 458040 40 0.0
.bss 64184 64184 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 585166 585206 40 0.0
.app_xip_area 459200 459240 40 0.0
.bss 68912 68912 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582326 582326 0 0.0
.app_xip_area 461944 461944 0 0.0
.bss 63392 63392 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1080724 1080812 88 0.0
.bss 132996 132996 0 0.0
.data 2048 2048 0 0.0
.text 945660 945748 88 0.0
BRD4161A+rpc (read/write) 1135052 1135132 80 0.0
.bss 149676 149676 0 0.0
.data 2260 2260 0 0.0
.text 983096 983176 80 0.0
BRD4161A+rs911x (read/write) 947252 947340 88 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 804416 804504 88 0.0
lock-app BRD4161A+wf200 (read/write) 1128384 1128488 104 0.0
.bss 144184 144184 0 0.0
.data 2060 2060 0 0.0
.text 982116 982220 104 0.0
window-app BRD4161A (read/write) 1074508 1074612 104 0.0
.bss 134468 134468 0 0.0
.data 2076 2076 0 0.0
.text 937940 938044 104 0.0
esp32 all-clusters-app c3devkit (read only) 1019596 1019660 64 0.0
(read/write) 1485458 1485490 32 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215344 215376 32 0.0
.flash.text 1019596 1019660 64 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1073531 1073583 52 0.0
(read/write) 487536 487568 32 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 245796 245828 32 0.0
.flash.text 1068147 1068199 52 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658288 658336 48 0.0
.bss 69516 69516 0 0.0
.data 1992 1992 0 0.0
.text 580980 581028 48 0.0
lock k32w061+release (read/write) 685060 685092 32 0.0
.bss 69980 69980 0 0.0
.data 2004 2004 0 0.0
.text 607276 607308 32 0.0
linux chip-tool-no-interactive-ipv6only arm64 (read only) 9989956 9989956 0 0.0
(read/write) 683569 683569 0 0.0
.bss 42609 42609 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 622480 622480 0 0.0
.dynamic 528 528 0 0.0
.got 13512 13512 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 476340 476340 0 0.0
.text 7955268 7955268 0 0.0
thermostat-no-ble arm64 (read only) 2593076 2593300 224 0.0
(read/write) 158289 158289 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83240 83240 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165380 165412 32 0.0
.text 2187920 2188112 192 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2447552 2447656 104 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1410196 1410300 104 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1174607 1174687 80 0.0
bss 142900 142900 0 0.0
rodata 141776 141808 32 0.0
text 811032 811084 52 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1154799 1154883 84 0.0
bss 142136 142136 0 0.0
rodata 133304 133340 36 0.0
text 800476 800528 52 0.0
p6 all-clusters-app default (read/write) 2564704 2564784 80 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1522968 1523048 80 0.0
all-clusters-minimal-app default (read/write) 2509744 2509840 96 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1468008 1468104 96 0.0
light-app default (read/write) 2440048 2440128 80 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1398312 1398392 80 0.0
lock-app default (read/write) 2467288 2467392 104 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1425552 1425656 104 0.0
telink light-switch-app tlsr9518adk80d (read/write) 796720 796812 92 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 565218 565278 60 0.0
lighting-app tlsr9518adk80d (read/write) 816548 816648 100 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 581540 581602 62 0.0

@woody-apple woody-apple merged commit 01db0fb into sve Jul 9, 2022
@woody-apple woody-apple deleted the cherry-pick-f241dd26921bd4180b28ead16651f7936227b03c branch July 9, 2022 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
app controller darwin examples sve cherry pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@woody-apple @andy31415